auto merge of #399 : lucidd/cargo/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 19 Aug 2014 00:14:11 +0000 (00:14 +0000)
committerbors <bors@rust-lang.org>
Tue, 19 Aug 2014 00:14:11 +0000 (00:14 +0000)

Trivial merge